Merge from trunk.

diff --cc src/ChangeLog
index 398217e8027fede10a802e7d43bf5b9a94fc4887,ed94e8ec631c0893b6055a2051c31fd2a9761fe9..ffb1ecedd5b562fe02db5fe6541f31a8544e401e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,12 -1,17 +1,24 @@@
+ 2011-07-09  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * chartab.c (uniprop_table_uncompress): Remove unused local variable.
+ 
+ 2011-07-09  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * gtkutil.c (qttip_cb): Remove code without function.
+ 
+ 2011-07-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * w32.c (pthread_sigmask): New stub.
+ 
  2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Fix minor problems found by static checking (Bug#9031).
 +      * chartab.c (char_table_set_range, map_sub_char_table)
 +      (uniprop_table_uncompress): Remove unused locals.
 +      (uniprop_table): Now static.
 +      * composite.c (_work_char): Remove unused static var.
 +      * gtkutil.c (qttip_cb): Remove stray no-effect statement.
 +
        Use pthread_sigmask, not sigprocmask (Bug#9010).
        sigprocmask is portable only for single-threaded applications, and
        Emacs can be multi-threaded when it uses GTK.